]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
main: Fix shell_dbus_acquire_names()
authorFlorian Müllner <fmuellner@gnome.org>
Mon, 7 Nov 2011 23:17:33 +0000 (00:17 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Tue, 8 Nov 2011 00:01:10 +0000 (01:01 +0100)
Commit 39727d1156 refactored dbus acquisition, but due to wrong use
of va_args we would only ever acquire the first bus name passed.

https://bugzilla.gnome.org/show_bug.cgi?id=658078

src/main.c

index f759d23a8ecca4737e2a571425d2de778be66b8a..d8cdff5b27a074c0a6ab95eaa20f7218e6432515 100644 (file)
@@ -61,19 +61,17 @@ static void
 shell_dbus_acquire_names (DBusGProxy *bus,
                           guint32     request_name_flags,
                           gchar      *name,
-                          gboolean    fatal,
-                          gchar      *other, ...) G_GNUC_NULL_TERMINATED;
+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
 
 static void
 shell_dbus_acquire_names (DBusGProxy *bus,
                           guint32     request_name_flags,
                           gchar      *name,
-                          gboolean    fatal,
-                          gchar      *other, ...)
+                          gboolean    fatal, ...)
 {
   va_list al;
   guint32 request_name_result;
-  va_start (al, other);
+  va_start (al, fatal);
   for (;;)
   {
     shell_dbus_acquire_name (bus,